From f79ebf12dda692af08f0688738b5e4544ca4d30e Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Sat, 20 Sep 2008 20:13:53 +0000
Subject: [PATCH] Read geocache type from maggeo file.

---
 gpsbabel/csv_util.c | 3 ---
 gpsbabel/defs.h     | 3 +++
 gpsbabel/maggeo.c   | 1 +
 gpsbabel/unicsv.c   | 3 ---
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index e8a55a8ca..200db154e 100644
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -138,9 +138,6 @@ xcsv_file_t xcsv_file;
 extern char *xcsv_urlbase;
 extern char *prefer_shortnames;
 
-extern geocache_type gs_mktype(const char *t);
-extern geocache_container gs_mkcont(const char *t);
-
 static double pathdist = 0;
 static double oldlon = 999;
 static double oldlat = 999;
diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index ae5fbcb8b..a857c290f 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -545,8 +545,11 @@ void xcsv_read_internal_style(const char *style_buf);
 waypoint * find_waypt_by_name(const char *name);
 void waypt_backup(signed int *count, queue **head_bak);
 void waypt_restore(signed int count, queue *head_bak);
+
 geocache_data *waypt_alloc_gc_data(waypoint *wpt);
 int waypt_empty_gc_data(const waypoint *wpt);
+geocache_type gs_mktype(const char *t);
+geocache_container gs_mkcont(const char *t);
 
 route_head *route_head_alloc(void);
 void route_add (waypoint *);
diff --git a/gpsbabel/maggeo.c b/gpsbabel/maggeo.c
index 4c6d333c8..abff9a9c9 100644
--- a/gpsbabel/maggeo.c
+++ b/gpsbabel/maggeo.c
@@ -127,6 +127,7 @@ maggeo_read(void)
                                 gcdata->hint = xstrdup(s);
                                 break;
                     case 12: // cache type
+                                gcdata->type = gs_mktype(s);
                                 break;
                     case 13:    wpt_tmp->creation_time = maggeo_parsedate(s);
                                 break;
diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c
index 4c54487d0..394c08400 100644
--- a/gpsbabel/unicsv.c
+++ b/gpsbabel/unicsv.c
@@ -275,9 +275,6 @@ static arglist_t unicsv_args[] = {
 	ARG_TERMINATOR };
 
 
-extern geocache_type gs_mktype(const char *t);
-extern geocache_container gs_mkcont(const char *t);
-
 /* helpers */
 
 // #define UNICSV_IS(f) (0 == strcmp(s, f))
-- 
2.30.2